From: Markus Rost <rost@math.uni-bielefeld.de>
Date: Wed, 31 Jul 2002 22:29:00 +0000 (+0000)
Subject: (ediff-backup): New autoloaded command.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~31288
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7bcf5719508da54fe7ea9f9268a75e1089a02a82;p=emacs.git

(ediff-backup): New autoloaded command.
---

diff --git a/lisp/ediff.el b/lisp/ediff.el
index 2db82f85547..5b0f85d05cd 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -367,6 +367,22 @@
 ;;;###autoload
 (defalias 'ediff 'ediff-files)
 
+;;;###autoload
+(defun ediff-backup (file)
+  "Run Ediff on FILE and its backup file.
+Uses the latest backup, if there are several numerical backups.
+If this file is a backup, `ediff' it with its original."
+  (interactive (list (read-file-name "Ediff (file with backup): ")))
+  ;; The code is taken from `diff-backup'.
+  (require 'diff)
+  (let (bak ori)
+    (if (backup-file-name-p file)
+	(setq bak file
+	      ori (file-name-sans-versions file))
+      (setq bak (or (diff-latest-backup-file file)
+		    (error "No backup found for %s" file))
+	    ori file))
+    (ediff-files bak ori)))
 
 ;;;###autoload
 (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name)